Added 404's for error handling instead of null [Fixed]