fixing null return values, i hope
fixing null return values, i hope