Card #48 Fixed NPE exceptions
Merge remote-tracking branch 'origin/develop' into develop