Fixed Nullpointer

a30c4bfe444a01587031656c1f75c10e
Prepared Beta