Bugfix: checking for none