temporarily remove NullPointer Exception
temporarily remove NullPointer Exception

AMICI-developer/AMICI,AMICI-developer/AMICI,AMICI-developer/AMICI,AMICI-developer/AMICI,FFroehlich/AMICI,FFroehlich/AMICI,FFroehlich/AMICI,FFroehlich/AMICI