Added null else