Merge pull request #172 from blasv/profile2

Fixed NullPointerException
fixed nullpointer exception
Merge pull request #174 from glee23/master

Fixed NullPointerException
Merge branch 'master' into profile2