Quick Fix for npe crash