Remove extra null checks + fixed makecurrent(NULL)