Fixed possible NullPointerException
Updated dev version