1.1 --- a/src/main/java/org/vaadin/console/Console.java	Fri May 20 19:24:29 2011 +0400
     1.2 +++ b/src/main/java/org/vaadin/console/Console.java	Fri May 20 20:38:40 2011 +0400
     1.3 @@ -815,7 +815,8 @@
     1.4          final Set<String> res = new HashSet<String>();
     1.5          if (commandProviders != null) {
     1.6              for (final CommandProvider cp : commandProviders) {
     1.7 -                res.addAll(cp.getAvailableCommands(this));
     1.8 +            	if(cp.getAvailableCommands(this) != null)
     1.9 +            		res.addAll(cp.getAvailableCommands(this));
    1.10              }
    1.11          }
    1.12          res.addAll(commands.keySet());