Removed Null Pointer error, but still not saving drawing
Merge origin/master