Nullable Fix

Fixed an exception safety problem with Nullable.