Fix SinkCommands NullPointerException