Crash Fix

Fixed NullPointerException