Fixed null pointer
Fixed source-maps in uglify