fixed nullpointer - #103/#105